Merge with PPC tree.
authorKeir Fraser <keir@xensource.com>
Sat, 7 Jul 2007 09:09:51 +0000 (10:09 +0100)
committerKeir Fraser <keir@xensource.com>
Sat, 7 Jul 2007 09:09:51 +0000 (10:09 +0100)

Trivial merge